feat(auth): add default workspace support for user handling #9099
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Introduce `defaultWorkspaceId` to improve workspace redirection logic. Updated GraphQL schema, server logic, and frontend components accordingly to prioritize default workspaces when available.
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR adds default workspace support to improve user redirection during authentication, with the main change being the introduction of a defaultWorkspaceId field in the UserExists response.
- Added
defaultWorkspaceIdfield in/packages/twenty-front/src/modules/auth/graphql/queries/checkUserExists.tsfor workspace prioritization - Updated workspace redirection logic in
/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsxto prioritize default workspace - Fixed duplicate state setting in
/packages/twenty-front/src/modules/auth/hooks/useAuth.tsclearSession function - Added explicit workspace domain cookie clearing in session management
- Updated handleVerify to use defaultWorkspace instead of previous selection logic
7 file(s) reviewed, 3 comment(s)
Edit PR Review Bot Settings | Greptile
Comment on lines
+10
to
+11
| @Field(() => String) | ||
| defaultWorkspaceId: string; |
There was a problem hiding this comment.
style: Consider making defaultWorkspaceId optional since a user might not have a default workspace set
packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.entity.ts
Show resolved
Hide resolved
Eliminates redundant setting of `domainConfigurationState` in the `useAuth` hook. This prevents unnecessary operations and ensures cleaner state management.
Refactored the data handling logic for the checkUserExists response to improve readability and maintainability. The changes streamline variable usage and eliminate redundant nesting. Functionality remains unchanged, ensuring proper redirection or mode-switching behavior.
charlesBochet
approved these changes
Dec 17, 2024
|
Thanks @AMoreaux for your contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduce
defaultWorkspaceIdto improve workspace redirection logic. Updated GraphQL schema, server logic, and frontend components accordingly to prioritize default workspaces when available.Summary
This PR adds a mechanism to handle and prioritize default workspace selection for users during authentication. It updates the logic in multiple components and services to ensure users are redirected to their default workspaces if no specific selection is provided.
Main changes:
GraphQL Schema Updates:
UserExistsGraphQL entity with a newdefaultWorkspaceIdfield to specify the user's default workspace.defaultWorkspaceId.Client-Side Updates:
useAuthhook to include logic for managing default workspace redirection.SignInUpGlobalScopeFormto utilize thedefaultWorkspaceId.Server-Side Adjustments:
AuthServiceto includedefaultWorkspaceIdincheckUserExists.Tests/Helpers:
UserExistsGraphQL).Subsequent function lifecycle was adjusted to include recheck for workspace token states when performing sign-in flows.